Fix several bugs handling GtkTrayIcon symbolic colors

https://bugzilla.gnome.org/show_bug.cgi?id=641059

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 3888e3c25758125df79f36c59565ed4e5b1c523e..00cf525805c023dbb164276b3455256a2b2e516d 100644 (file)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -860,6 +860,12 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
   gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image);
   gtk_widget_show (priv->image);
 
+  /* Force-initialize the symbolic colors */
+  g_object_notify (G_OBJECT (priv->tray_icon), "fg-color");
+  g_object_notify (G_OBJECT (priv->tray_icon), "error-color");
+  g_object_notify (G_OBJECT (priv->tray_icon), "warning-color");
+  g_object_notify (G_OBJECT (priv->tray_icon), "success-color");
+
   g_signal_connect_swapped (priv->image, "size-allocate",
                            G_CALLBACK (gtk_status_icon_size_allocate), status_icon);
 
@@ -1658,10 +1664,11 @@ static void
 gtk_status_icon_fg_changed (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv = status_icon->priv;
-  GdkColor color;
+  GdkColor *color;
 
   g_object_get (priv->tray_icon, "fg-color", &color, NULL);
-  gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, &color);
+  gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, color);
+  gdk_color_free (color);
 }
 
 static void
@@ -1671,7 +1678,7 @@ gtk_status_icon_color_changed (GtkTrayIcon   *tray,
 {
   GtkStatusIconPrivate *priv = status_icon->priv;
   const gchar *name;
-  GdkColor color;
+  GdkColor *color;
 
   switch (pspec->name[0])
     {
@@ -1695,10 +1702,11 @@ gtk_status_icon_color_changed (GtkTrayIcon   *tray,
 
       g_object_get (priv->tray_icon, pspec->name, &color, NULL);
 
-      rgba.red = color.red / 65535.;
-      rgba.green = color.green / 65535.;
-      rgba.blue = color.blue / 65535.;
+      rgba.red = color->red / 65535.;
+      rgba.green = color->green / 65535.;
+      rgba.blue = color->blue / 65535.;
       rgba.alpha = 1;
+      gdk_color_free (color);
 
       gtk_widget_override_symbolic_color (priv->image, name, &rgba);
     }

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index a8f6a1191372b069ecdf1117ba4732d44fbc18f4..0e4a36badddcee4cfb5eac114335a0a966c16d3f 100644 (file)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -555,8 +555,6 @@ gtk_tray_icon_get_colors_property (GtkTrayIcon *icon)
           g_object_notify (G_OBJECT (icon), "error-color");
         }
 
-      g_object_thaw_notify (G_OBJECT (icon));
-
       color.red = prop.prop[6];
       color.green = prop.prop[7];
       color.blue = prop.prop[8];
@@ -568,8 +566,6 @@ gtk_tray_icon_get_colors_property (GtkTrayIcon *icon)
           g_object_notify (G_OBJECT (icon), "warning-color");
         }
 
-      g_object_thaw_notify (G_OBJECT (icon));
-
       color.red = prop.prop[9];
       color.green = prop.prop[10];
       color.blue = prop.prop[11];